Skip to content
This repository has been archived by the owner on Jun 21, 2023. It is now read-only.

Restore macOS map SDK; clean up iOS, macOS changelogs #178

Merged
merged 7 commits into from
Feb 26, 2020
Merged

Conversation

1ec5
Copy link
Contributor

@1ec5 1ec5 commented Feb 25, 2020

This PR restores the macOS map SDK that had previously been maintained in the Mapbox GL Native monorepo.

macosapp

The macOS build has over a hundred warnings due to a CMake misconfiguration in gl-native, which will be fixed by mapbox/mapbox-gl-native#16228. That PR doesn’t strictly block this one, however.

This PR also cleans up the changelogs for both iOS and macOS. The overgrown “master” section of the macOS changelog has been reorganized and copyedited. The iOS changelog now reflects the iOS map SDK v5.5.1 release and incorporates some of the same copyediting as the macOS changelog.

Fixes mapbox/mapbox-gl-native#13386.

/cc @mapbox/maps-ios

Restored macOS make targets, including the genstrings target shared between iOS and macOS. Updated macOS build settings to align with current CMake build system.
Fixed make warnings about duplicate commands getting overridden.
iOS and macOS once again share most build settings.
@1ec5 1ec5 added documentation Improvements or additions to documentation ios build macOS labels Feb 25, 2020
@1ec5 1ec5 requested a review from a team February 25, 2020 02:34
@1ec5 1ec5 self-assigned this Feb 25, 2020
OUTPUT=$(OUTPUT) ./platform/macos/scripts/document.sh

.PHONY: genstrings
genstrings:
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This make rule got removed along with all the other macOS rules at some point, but it’s actually important for keeping both the iOS and macOS map SDKs in sync with Transifex.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @tmpsantos @mapbox/gl-native @brunoabinader

circle.yml Outdated
@@ -202,7 +202,7 @@ commands:
steps:
- run:
name: Install macOS dependencies
command: brew install cmake ccache
command: brew install cmake ccache pkg-config
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

// AppKit incorrectly uses calibrated RGB when exporting HTML, so input
// calibrated RGB to ensure round-tripping.
// <rdar://problem/46115233> <http://www.openradar.me/46115233>
NSColor *redColor = [NSColor colorWithCalibratedRed:1 green:0 blue:0 alpha:1];
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a reprise of mapbox/mapbox-gl-native#13387 that’s now possible because CircleCI is running a newer version of macOS.

AppKit incorrectly uses calibrated RGB when exporting HTML, so input calibrated RGB to ensure round-tripping.
@nishant-karajgikar
Copy link
Contributor

Thanks for doing this @1ec5 !

@1ec5 1ec5 merged commit 105c3d2 into master Feb 26, 2020
@1ec5 1ec5 deleted the 1ec5-macos branch February 26, 2020 22:31
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
build documentation Improvements or additions to documentation ios macOS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

-[MGLTileSetTests testTileSetFromTileURLTemplates] fails on High Sierra and above
3 participants